Revert 20954:b4041e7bbe1b "paging_domctl: Add missing breaks in switch stmt"
authorKeir Fraser <keir.fraser@citrix.com>
Fri, 26 Feb 2010 17:09:50 +0000 (17:09 +0000)
committerKeir Fraser <keir.fraser@citrix.com>
Fri, 26 Feb 2010 17:09:50 +0000 (17:09 +0000)
This fixed a fairly innocuous bug (OP_ENABLE/OP_OFF both don't work
properly) but unmasked a much nastier one (turning off shadow mode on
a PV guest crashes the hypervisor).

So, for now, we pick the less of two evils. We don't really much rely
on OP_ENABLE/OP_OFF anyway, as it happens.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
xen/arch/x86/mm/paging.c

index 6bc23848a05c91f9c3db48fb96beb1251a1f3662..e1a4716b21a32a6da55cdf972ce8825145a5a23d 100644 (file)
@@ -714,13 +714,11 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc,
                 hap_logdirty_init(d);
             return paging_log_dirty_enable(d);
         }
-        break;
 
     case XEN_DOMCTL_SHADOW_OP_OFF:
         if ( paging_mode_log_dirty(d) )
             if ( (rc = paging_log_dirty_disable(d)) != 0 )
                 return rc;
-        break;
 
     case XEN_DOMCTL_SHADOW_OP_CLEAN:
     case XEN_DOMCTL_SHADOW_OP_PEEK: